Litte changes

Renaming some variables and such.