Cleanup and implemented fuzzyMatch