Reorganized variables on window