Clean up object creation to use more common code