some more spring checkstyle fixes