Refactor requires for install