DEP-89 Code review