Improve Bootstrap samples
Add registerScripts on evaluator
Clean code