Fix some mindless cleanups.. actually works now