Fix checkstyle #202 #203