Incorporate @ewels suggestions from #17