Linux Optimized version
Windows code cleaning

Windows and Linux codes are the same