[DF-4399] Added commentaries, small code refactor,