minor: first pass at cleaning up checkstyle warnings