Now passes checkstyle.