Styling clean up