[FIX] little refactors and code fixes