a little more clean up