Cleaned up labels and comments.