PLAT-4486 - Fix checkstyle issues