Simplify Factory base don Scrutinizer suggestion