Further attempts to reduce duplicated math.
Storing as variables is actually slightly slower, so just reverted back to how it was previously