[FIX / MOD] small cleaning