Renamed variables for clarity and removed unnecessary else.#1624

kmvanbrunt merged 1 commit intomainpython-cmd2/cmd2:mainfrom

decorator_cleanuppython-cmd2/cmd2:decorator_cleanupCopy head branch name to clipboard