minor changes conditional if statements