Added Regex to remove trailing/leading .,-