refactoring to have just one window and improving parts of code