copyright update
copyright update
code cleanup