CORE-513: Address PR comments.
CORE-513: Address PR comments.

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