refactoring class name
resimplify the GUI