General grammar cleanup.