Clean up
Styling changes