bit more clean up