Typo removals, code cleanup