don’t try to de-tokenise the command if it’s empty.
fixed method renaming after one of the previous refactors.
cleaned up imports