Cleanup and copyright change.