Cleanup & fix typo