Styling changes and cleanup