cleaned the variable names and fixed 2 errors