Removed else statement on line 350