Refactoring, modifications, checkstyle