DRY'd up the factories