Small code cleaning and reorg
Merge branch 'mably' of https://github.com/mably/btcchain into mably