Reformatted some modules