Consider removing the else clause?