clean up, add copyright