Code refactor and some seeds