small changes from Jeremy's comments in git