- fix some checkstyle problems