Reverted change that didn't make any sense.
Separated ternary operator
Moved variable above access