Tweaking var names and things.