clean up and notes