Improve RegEx to be more strict about where for/of are to remove them