Really minor change - use factory method instead of constructor