Revert "Factorize"

This reverts commit 0d80fbc45bb9a523e650f3f473875aafa16ce940.