Neatening and attempt to fix multiple running