Added checkstyle changes