Cleaning up the code
Merging files