Editing multiple files

Cleaning and organizing