Update Source Code

Just made it a little bit cleaner
Merge pull request #1 from NDJ1/patch-1

Update Source Code