Use pypi Command and simplify up the command run handling