bob: cleaning things up a bit