Assignment done

All that I did was rename some variables and functions, and renaming the variables wasn't even necessary...