remove idiosyncratic variable names

Removing and renaming variables that were only relevant to the initial implementation to replace as necessary with new variables and input arguments. At this stage it's now probably broken! Sorry about that.