Replaced two instantiations with factory methods