Small changes for checkstyle.