Incorpoorate review suggestions

refs https://github.com/conformal/btcwallet/pull/138
thanks, will keep in mind to re-visit this.