Styling tidy-up