Commands Tidied up further.