cleaning things up a touch