minor cleanup

See individual commit messages

Edited by Christian Glombek

Merge request reports

Loading