a little cleanup especially for David