Modularized decision tree code more