did some restructuring of the Account class