Merge "Fixed Checkstyle issues"