clean up + using inner class object for old enums