Unconfuse me :)
Merge pull request #1 from sirugh/cleanup

I guessssss