Refactor code, blocking movement