Refactoring company's creation