More typo fixes
Code cleanup