Spacing and variable name cleanup