Formatting refactoring