Clean up enum stuff a little