Remove Type Enum and Improve README