corrected indentation
initial refactor dump labels to one method in batch