refactoring some more inline elements to put a single match in common area, using makeInline template