Take in some suggestions from #22