[NATIVESDK-156] Code Refactor