Refactor install methods