Movement Patch and Code tidy