Styling and some cleanup