changed class vars to constants