FIX: Corrected typo
STY: Removed dead code and some spaces