DRY some more