renamed file
An easier and more robust comment insertion

Replaced the long and unnatural way of finding the comment's scope with
short and natural.