Cleaned up DrawingEnum code