Tidied up roll command