code review tweaks