Refactor factories, revisit visitors

[permalink]