Tidying up the installation process.