Address comments from #54