Cleanup
Fix copyright notice