refactoring formatting