clean up and changes