Some styling and some edits