A little cleanup and some styling.