Refactering aan SchedulerSolver