Installation refactor