Minor refactoring. (mostly autoformating)