Address comments from @ElDeveloper and @gregcaporaso