minor: code refactoring following upstream coding conventions

upstream [coding style](https://github.com/bitcoin/bitcoin/blob/master/doc/coding.md) makes merges easier