Clean up typos and formatting