Various checkstyle modifications