Refactoring company creation