Reorganizing enum values to be used via ordinal()