Refactoring Account Controller in Progress