Tidied up the movement!