CORE-805: Address PR Comments.
CORE-805: Address PR Comments.

breadwallet/breadwallet-core,breadwallet/breadwallet-core,breadwallet/breadwallet-core,breadwallet/breadwallet-core,breadwallet/breadwallet-core,breadwallet/breadwallet-core