Some light editing and reformatting.