Change all the things.

Just cleaning up a bit.