Slight interface cleanup
Merge branch 'second_purchase'

* second_purchase:
  Slight interface cleanup