Fix typos, clean up formatting