Cleanup factories
Merge pull request #35 from bakura10/cleanup

Cleanup factories