typos/clean-up