Refactor Account controller