diff --git a/pkg/rear-manager/solver_controller.go b/pkg/rear-manager/solver_controller.go
index 6618f97..de5ad2f 100644
--- a/pkg/rear-manager/solver_controller.go
+++ b/pkg/rear-manager/solver_controller.go
@@ -86,7 +86,6 @@ func (r *SolverReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctr
 	ctx = ctrl.LoggerInto(ctx, log)
 
 	var solver nodecorev1alpha1.Solver
-	// var contract reservationv1alpha1.Contract
 	if err := r.Get(ctx, req.NamespacedName, &solver); client.IgnoreNotFound(err) != nil {
 		klog.Errorf("Error when getting Solver %s before reconcile: %s", req.NamespacedName, err)
 		return ctrl.Result{}, err
@@ -659,16 +658,14 @@ func (r *SolverReconciler) searchPeeringCandidates(ctx context.Context,
 	return result, nil
 }
 
-// TODO: unify this logic with the one of the discovery controller.
 func (r *SolverReconciler) selectAvaiablePeeringCandidate(
-	pcList []advertisementv1alpha1.PeeringCandidate) (*advertisementv1alpha1.PeeringCandidate, error) {
-
+	pcList []advertisementv1alpha1.PeeringCandidate) (*advertisementv1alpha1.PeeringCandidate,
+	error) {
 	var pc *advertisementv1alpha1.PeeringCandidate
 
 	for i := range pcList {
 		pc = &pcList[i]
-		// Select the first PeeringCandidate that is not reserved
-		// TODO: A better default logic should be implemented.
+
 		if pc.Spec.Available {
 			return pc, nil
 		}
@@ -678,7 +675,8 @@ func (r *SolverReconciler) selectAvaiablePeeringCandidate(
 	return nil, errors.NewNotFound(schema.GroupResource{Group: "advertisement", Resource: "PeeringCandidate"}, "PeeringCandidate")
 }
 
-func (r *SolverReconciler) createOrGetDiscovery(ctx context.Context, solver *nodecorev1alpha1.Solver) (*advertisementv1alpha1.Discovery, error) {
+func (r *SolverReconciler) createOrGetDiscovery(ctx context.Context,
+	solver *nodecorev1alpha1.Solver) (*advertisementv1alpha1.Discovery, error) {
 	discovery := &advertisementv1alpha1.Discovery{}
 
 	// Get the Discovery
diff --git a/tools/scripts/clean-dev-env.sh b/tools/scripts/clean-dev-env.sh
old mode 100755
new mode 100644
diff --git a/tools/scripts/setup.sh b/tools/scripts/setup.sh
old mode 100755
new mode 100644