QUASAR: Cleaning up some if statements

Need to prevent any chance of accidental misinterpretation of the 
if logic.