refactoring, styling, focus