Better variable naming and tweaks.