[TASK] Cleanup the design