cleean up use of Enum