Remove commented code; set label consistently