more cleanup of the spec