Fix most checkstyle warnings