[DF-651] Small refactor