Remove useless "fake task" and grammatical improvements (branch master)