reduced checkstyle bugs