Refactor Install