Cleanups and copyright date update