Revert "less code review"

This reverts commit 8597816cf8227b21db59eabd55e5f554b14fd8f4.