[GF] Small refactor