Checkstyle corrections