more of account_type refactoring