Merging collapsible if statements increases the code's readability

[AymanDF]

This pull request is focused on resolving occurrences of Sonar rule squid:S1066 - “Collapsible "if" statements should be merged”. You can find more information about the issue here: https://dev.eclipse.org/sonar/rules/show/squid:S1066 Please let me know if you have any questions. Ayman Abdelghany.