Get rid of the else (fix the underlying impediment). I believe the above refactoring should work for this.