Fix nestif lint issues (golangci-lint)

[LeonardYam]

nestif detects complex nested if statements.

Reasoning - Complex nested if statements affects code readability and should ideally be refactored

Any lint issues related to gochecknoglobals can be found by searching for // nolint:nestif

Related issue: #2984