More appropriate variable names and general code cleanup.