Code clean-up

I know, I'm annoying... but my OCD got the better of me.