Minor formatting throughout.