Styling changes and misc cleanup.