James D. Callahan III:
	- Variable renames and minor refactoring.
