GitLab

First cleanup step, changing function names and passing parameters all the way through without using args. Identical output as before.