Cleanup and fix typo.