Fix: Restructure code