Improved some variable naming.