Reduced complexity of ContentMatcher, Removed duplication (relates to #29)
Fixed variable name