[PLAT-5023] more checkstyle formatting