[DF-1627] Small fix after review. Added some comments.