Refactor move expansion