Fixed some more Checkstyle issues and other small changes