Renamed variables.
Reformatted file.