cleaning some things up