gf : minor cleaning