Cleanup a bit

Cleaned some of the grammar in various places, and trimmed some excess
statements from various functions.