done some code CleanUp and Comments