cleaning up the old enumeration for cleaner code