Re-edited documentation and labeling