cleaned up account controller a bit