Move $G to helpers and remove $body