GUI.Class
Refactoring