Fixed even more Checkstyle issues and other small changes