Adding Copyright Information and few cleanups