adding a little more clean up