[LFTILI-69][LFTILI-70][LFTILI-71] - refactoring related changes