Cleanup and fix another typo