Refactor

[danparizher]

Recreated this refactor to your patch branch so that you can review.

[danparizher]

I'm not too sure why other commits are appearing - I'm not too familiar with Git and how to get my correct changes to appear.

[Sizzzles]

These commits look to be correct. Didn't really check the commits after but I'm currently using the commits I found to test. Looks like when you merged branches it messed some things up

[Sizzzles]

Didn't mean delete branch and close this....