Tighten and relable
Tidied and relabeled