code review tweaks.