renames; simplify extraction of single lines