checkstyle, eclipse fixes