Clean up a lot of small shit