Cleanup code
Add more FactoryExpressionBase usage