Formatting + fixed some typos