update copyright notice and other cleanup