Upgraded Checkstyle to version 6.1