Changes to matcher

Made it cleaner