Resolved a bunch of checkstyle issues