Refactor move options