cleaning it up a bit . . . long way to go