tweaks based on code review