first attempt to make cluster package checkstyle compliant