Reform checkstyle a little bit