Cleaned a bunch of things up.