Checkstyle template modification pack #2