Refactor accounts to be DRY