fixes for checkstyle violations