Cleanup.
Updated copyright year.