1st bundle of refactors from WinGit