Refactor the commercial_type to use the options arguments

* This allows the options passed into each method to be used, rather
  than only using the options in the constructor.