Minor indendation and variable name changes