addressed @scopatz's comments