fix style and typos