Clean up CFG description