checkstyle based corrections