Refactor delete-space to clean up after adding -o
Refactor delete-space to clean up after adding -o

- Combine conditional assignments
- Fix legacy help string
- Change var initialization style
- Use the correct org name in status message (was previously always from
config)

Thanks to Anand for a code review; it helped provoke this.

Signed-off-by: Jesse Alford <7eb8b6651ba82b1b546cc020ab9d511fcbb7c407@gmail.com>

cloudfoundry/cli,cloudfoundry/cli,cloudfoundry/cli