Going through MODULE, cleaning up the loops