and a bit of cleanup for good measure