Right, done my wee clean-up. If I've made some kind of horrible error, please let me know. I just went based off of what I was given, friends. :<

Guess it's an alright thing to do, though! Bit of house-keeping? Keeping house?