Refactored some code
Merge pull request #4 from Martind64/DesktopBranch

Refactored some code