tidy and typos