Address comments

Remove leading spaces before hyphens,
modify line breaks,
correct casing.