Checkstyle changes