accountcontroller refactoring