refactor: requireds unified