[UNITYSDK-180] Cosmetic code changes and clean ups