Derp :P
More cleanup! Yay -.-
More cleanup -.-