Resolved some checkstyle issues