[minor] Tweaks and adjustments following code review.