Tweaks from code review feedback