Movement code refactoring and other small changes.