Improve installation script