Tidy up dirtybench a little more