Cleanup and fix typo