Added quotes, Refactored to uses regex's