Commented out sorting code
Change formatting, move labels to outside