cleaning up some checkstyle violations