Changed names of subs properties
Added regexes for cleaning operator names