[DF-420] Did some refactoring