Code review tweaks