Fixed several Checkstyle issues