Cleaned up enum syntax