Tweaks and cleanup.