Improving setup script