Add more checkstyle rules