refactor the install streamline