Improving setup script.