[FIX] beautify code (RT-2684)