some refactoring in base matcher

Signed-off-by: Chris Boertien <chris@aktionlab.com>