Added label, some cleanup