Yo fred here are my lunch-break modifs

I've started suggesting some changes to code via Git at work, hopefully you'll understand what's going on too, the green are my modifs and the red is what you have currently.