Typos and beautify