Minor Account refactoring.