copyrights cleaned up