Refactor commercial flag setting to use a lookup table
Refactor commercial_type to be set in #initialize

* Remove #commercial_base? and #commercial_type? which are no longer
  needed since the logic is only used in one place.