Removed wasteful else statement