Minor code cleanup and acronyms fixes