[TASK] Cleanup
--TYPO is fixed