styling, refactoring