Fix the typos and unintentional changes