Removed some duplication from content and typography