add missing modules
fix coding style