another degroovyfication
almost final degroovifications
more degroovy