Refactor rate commission
Refactor commission