Tidied Code

Removed some unneeded variables