Refactored carrier abstract to use helper for simple rates.
Cleaning up carrier abstract.