Styling cleanup