Minor variable names and indenting.