Improve Bootstrap samples
Clean code