style cleanup, typos