Add code cleanup commits to windows