Simplify code
Fix typo