Better seed data; some refactoring