Code review changes again