Some minor tweaks and cleanup.