Cleanup (mostly), can't recall the tweaks made