Editing multiple files

Cleaning and commenting