address code review issues from @kyleabeauchamp