cleanup, reworked enums