tidy up re: @jjallaire's comments