Remove 'else' in if