Fix formatting; move a copyright notice into NOTICE.