a little further cleanup