Squashed commit - refactoring + cleanup
Merge branch 'master' of https://github.com/scbd/accounts.cbd.int