A little styling, and some cleanup.