some clean ups for lfg