Tidied up commands