Revert "[DF-5048] minor refactoring of code."

This reverts commit ec063d3e49581ad9b4b86a5c7981051e92b64ae1.
[DF-5048] minor refactoring
Merge branch 'development' of https://github.com/dava/dava.framework into development