Fix typo, more formatting fixes