Refactoring account
Refactoring transaction