Revert misspelling fix

- revert curent misspelling
- Fix another misspelling
- Fix some formatting issues