Formatting, very minor refactoring