formatting, refactoring