Minor grammar corrections and clean-up

I cleaned up a little bit in the code. I also corrected some
grammatical issues.