[JRO] Pull req feedback

Thanks to comments from @gabebw and @calebthompson