Fix acronyms and clean a bit more.