1) code cleanup 2) added CalcAvgDist function