[FIX] code cleanup