further de-groovyfying things
string constant refactor