move around enums after review