Small style changes.
More structural changes.