Minor tweaks and addition of cleanup script