Improve install procedure