Checkstyle and pom changes