Small reformating and refactorings.