no logic changes, cleanup and copyright year updates