Minor code review tweaks