Fix: do not start a thread if a matching computation is already running
Some refactoring