Reformat the if/then/and/or