code beutification
code sync with rhns-remove-package