more clean up and changes