Code CleanUp & Source1 & Source2 checkin

Code Clean up & Source 1 code And Source 2 code