Clean up variable names, spacing, and a few other things

Merge request reports

Loading