fixes per bugfinder/checkstyle
cleanup