Refactoring to reduce nesting in the conditional statement blocks

[TrilokGeer]

There are recurring patterns of nesting conditional blocks the needs to be refactored for better readability. Also, conditional nesting introduces more probabilities to handle and might introduce bugs over time.