Removed excess 'else' condition