Mainly Checkstyle related improvements