How about reversing the if as well to get rid of the empty block?