Clean code
Merge pull request #1 from SharpMelon/master

Clean some code