A bit of cleanup
I wish i could rewrite history...