Some Cleaning
Merge pull request #7 from Ninja5tyl3/dev

Some Cleaning