Minor tweaks and clean up.