Formatting. Slight refactoring