Remove superfluous code
Fix typo bug