cleaned up tangled spec