Refactor seed for production
Refactor on form view