Clean up and add copy right