Clean up, Fix typos