Refactor account information