Address comments from @ebolyen's review