basic optimizations based on profiler findings - making enum values a
field