Some cleanups
Add copyrights