More PlayerMovement Cleanup