feedback and bit of cleanup