Cleaned the enums and cleaning