Changes to variable naming and code spacing conventions.