Typo fix and some formatting