Cleaned up ConfigureInstallations code