Refactor seeds and sample data