added threshold and step constants
cleanup klass name construction