cleaning file + first round of edits