Fixing style and typos