Correct some comment grammar
Lint cleanup