[FIX] Messy code