Refactored company-creation code.