a small fix and clean up