Tidied Code, changed command