Addressing @arnehormann's comments in #59