Refactoring of Parse function used by CBN

Refactored Parse function,
as well as small change to comment parser util