code Cleanup fro commit - 707834bf107d0f015bbb2329984455f41286b8c1