updating migration
commenting and refactoring