Fix typos, unify formatting