minil migrate
refactoring