front: Minor code cleanup and variable renaming.