reformat and add bug-scope comment