Merge "Removed checkstyle warnings"