Cleaned up master and subproblem from Dantzig