small tidy
Merge https://github.com/wilhelm-murdoch/gost