changes to reflect comments on github