Replaced If statements

[sojinsamuel]

Related Issue

There weren't any issues, a code review was being done which could increase the code readability and precision.

Your solution

if statements were replaced with a short circuit evaluation.

How Has This Been Tested?

Checked on my local pc. works fine without breaking anything.