fixing checkstyle issues with no end in sight