Tidy up grains.go