moved labels into comments