some checkstyle fixes