added multiline-comment context, small refactorings in context