Clean up
Update copyright information