minor code cleanup for pricing model changes