Fixed further checkstyle warnings