[TASK] Refines use statements