Refactor requires