Added formatting and more minor changes.