Updated checkstyle configuration & affected files