Installer: minor refactoring