Fixed checkstyle warnings better