End of night commit: comments and formatting

Nothing to see here, move along. (Habitual end of night commit)