Window|Refactor: Various cleanup refactorings