Revert "Code review changes"

This reverts commit e1eb346dd472bed6df5b05a365d244bc04d916d8.