Maintain indentation better when reindenting
Fix misspelling