removed commented out stuff
alphabatixed definitions with no chang eto any of the definitions