Fix copyright, cleanup