bit of cleanup+docs