Reformatted whole module to a simpler design