Windows cleanup and changes