Few modifications to the checkstyle rules