A little further cleanup