Typo fix and prettyfication