some modules and some cleaning