reformatting, typos