a little bit of cleaning things up