Account utilities, refactoring