Install refactoring

Same here, see comment to `install_swift`