Cleanups and tweaks