[REFACTOR] Renamed variable for greater clarity
[REFACTOR] New SDK - minor refactors and tidy up