Implement code review feedback
Merge pull request #12 from google/richie-rapidreseller-improvements

Implement code review feedback