Code review tweak