Update copyright string
More cleanup