did a bit of cleanup