More cleanup and tweaks.