[FIX] more coding style fixes