Mostly style updates
Merge pull request #15 from google/richie-rapidreseller-improvements

Mostly style updates