Fix typos and formatting part 2