You are both absolutely right! I was trying to modify / adapt inherited TS... but I'll be better off to refactor the all thing! If the code is not understandable or too complex, it surely means it could be simplified!