refactoring
Merge pull request #1 from alhetimamoon/gui

refactoring