source formatting, typos