matchers refactoring
fixed comments parsing