Resolved some Checkstyle issues