Fixed a few checkstyle issues