[FIX] organize code...