Cleanup and typo fixes