Updated formatting

Consistent formatting throughout.