Copyright and general cleanup