Simplification

Even more simplified array version using enums as array indexes.
Don't know if enum to int autoboxing is cross platform or not.