Clean up salt::grain

Make the manifest conform to coding standards and make it a little easier to
read too.

Change-Id: I2f10dcabf01d07ff2fb9f28571cb77e66b4a12e9