Simplify aspects of extracted code