Clean up a couple things