Refactor account