Code gardening
Copyright update