Fix checkstyle + animal sniffer