small refactoring and the second experiment of the second paper