Refactor : Window