Refactored Window code