[umkogut and araujot] Code clean up
[whole group involved] Added a single label. We're amazing developers!