Fix some pep8
Make npm.uninstall and npm.removed more consistent, Fix #4674
Merge pull request #5038 from basepi/npm4674

Make npm.uninstall and npm.removed more consistent, Fix #4674