tweaks from code review