FIX: Corrected typo
STY: Removed dead code and some spaces
Merge pull request #14 from elieux/issue12

Cosmetic changes