Refactoring (Checkstyle)