Simplified the use of the filePath and improved code quality on android
Improved code quality on windows