Improve defintions, algorithms and labels in algorithms