Fixing formatting and typos