Improved - useless conditions removed.

Signed-off-by: Yousha <Yousha.A@Hotmail.com>