Fix some complexity in the create method.