Typos + Reindent