AccountController refactor