Reformat for "house style".

 Collapsing two ifs into one.