Minor tweaks and cleaning up