Changed the names of variables and functions again to be more readable
Merged the conflicts