Cleanup and final tweaks