Fixed bug

Labelings weren’t handled correctly
Cleanup