Cleanup Gherkin guide

My second PR cleaning up a guide. I'll try to also clean-up the other articles, one a day (to keep things easy to follow).

To make it clear why I've done some things, I'll add some comments.