Account type select works and did some code refactoring.