More factory girl
Cleanup.
Comment factory