refine comment format
restore config files to upstream version