More clean up and typo fixes