Rewritten conditions to be more readable

[luckylooke]

Thanks for sharing your code, I have rewritten few rows to make code more readable, thanks