did some code cleaning in the conditinals specs