Refactoring: preparation for new lat comp calc.
Refactoring: preparation for new lat comp calc.

hsnlab/escape,5GExchange/escape,5GExchange/escape,hsnlab/escape,5GExchange/escape,5GExchange/escape,hsnlab/escape,hsnlab/escape,hsnlab/escape,5GExchange/escape,hsnlab/escape,5GExchange/escape