refactor movement