Factory system reviewed and simplified.