Improve python-setup