fixes specs, removes if statements