Refactoring, styling