Tiny bit of cleanup for outside consumption