More enum cleanup