Else block is gone? Merge the two if statements?