and a bit of cleanup