Clean up blocks
Fix a typo