Changed methods from camelcase to underscores
Changed enum checking to use in keyword