[FIX] improve code quality