Formatting, minor refactoring