Cleanups abound
Clean up some more enums