Remove more redundant code
Fix a typo