Tweak from code review