COSMETICS + UNIFICATION
USING typedef enum INSTEAD OF enum...