Cleanup and fixes from review

Style changes, no longer update consumer unless entitlementStatus
has changed