Organize enums a bit better