[FIX] cleaned code