More comments, style, etc
SCSS cleanup to refamiliarize myself with all of it
Function name change
More refactoring