Migrating. Refactoring