Fix spacing, wording and style