feat(refactor): general refactor of if statements #2492
Standardsiseing some if statements and minor code improvements from today recommendations
Type of change
PR will not be merged until all steps are complete.
Provide Github Email
Fill out below info or tick box below:
All pull requests will now be squashed to create a tidy commit history and simplify changelog creation. You can provide either your own email or a GitHub-provided no-reply email.
When a PR is squashed the author becomes the person who squashed the PR. This removes you as the author of your own PR.
If documentation does need updating either update it by creating a PR (preferred) or request a documentation update.
Thank you for your Pull Request!