Algorithms cleanup

Jens Luchtrequested to merge
algorithms-cleanup into master

Minor algorithms cleanup. More readable code and remove unnecessary copying of variables.

Merge request reports