[TASK] Optimise and sort imports