copyright notice added and cleanups