CORE-329: Address PR comments
CORE-329: Address PR comments

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