Refactoring of the Window Tool