Refactor install & link