Refactor account controller pt1