Address comments from #58