Tweaks following code review