Clean up and tweaks