Fix code formatting
Refactor handling of commercial_base option for USPS

* Move the test for commercial_base configuration into a private method
* Prepare code layout to handle commercial_plus configuration option
  with minimal changes.
Add commercial_plus configuration option for USPS