Cleanup enum creator a bit