Fix awkward sentences and types