Resolved checkstyle issues that break the qa build