Correction conf modules
clean up code