implemented Adam Ralph's comments from initial commit