Styling improvements and cleanup.