cleaning it up some