cleaning things up a bit