Refactor AccountController