Code cleanup; update copyright