Changes for checkstyle