Light refactoring of gvm-installer