Refactor bunches of things.