Second phase of HOPAccount class refactoring