Styling and refactoring