Fixup error

Thanks Emmett. I appreciate the advice.

I'm convinced that moving to functions wont sort the fixup error though (although it will make it more readable). I'll test it this evening.