adapt to code reviews