comment/copyright cleanups