Nstonehouse/refactoring/matcher string