Reset some comment and fix checkstyle