Cleanup and tweaks