Styling and cleanup