Minor overall tweaks based on Steinke feedback