Removing unneeded interpolation, tidying up some data manipulation and u...

...se of .match