Improve naming of variables, clean code
Improve filenames