Refactor: account module