Language/grammar cleanup