Skip to content

Simplify factory

Simplify factory #353