Some more clean up and prep work