refactor prepare command
refactor moving local changes