Refactoring formatting