a bit of cleanup
a bit of cleanup