More refactoring on BCWallet class