acountent refactoring