more clean up code