Revert factory changes in favor of more readable factories