formatting refactoring