general tidy and typos