quick comment and labels cleanup