Fixed Checkstyle issues