Updated whitespace and variable naming for files that I'm about to be working on. This should make the next merge request easier to review.