Cleaning the code and changing variable names
git hub is acting up